From: Johannes Maibaum <jmaibaum@gmail.com>
Date: Mon, 18 Aug 2025 20:26:10 +0000 (+0200)
Subject: st/entry: Avoid crash in update_*_relation
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~88^2~9^2^2~41
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=20c78cc43123c22022882d83da722e2b547dafbe;p=gnome-shell.git

st/entry: Avoid crash in update_*_relation

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3839>
(cherry picked from commit 093a2d0c27b6da6db10946dfcf36c00bd4e94a88)
---

diff --git a/src/st/st-entry.c b/src/st/st-entry.c
index 83ce19040..fad92ae67 100644
--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@@ -1646,6 +1646,9 @@ update_hint_relation (StEntry *entry)
   accessible = clutter_actor_get_accessible (priv->entry);
   entry_accessible = ST_ENTRY_ACCESSIBLE (atk_object_get_parent (accessible));
 
+  if (accessible == NULL || entry_accessible == NULL)
+    return;
+
   if (entry_accessible->current_hint != NULL)
     {
       atk_object_remove_relationship (accessible,
@@ -1684,6 +1687,9 @@ update_label_relation (StEntry *entry)
   accessible = clutter_actor_get_accessible (priv->entry);
   entry_accessible = ST_ENTRY_ACCESSIBLE (atk_object_get_parent (accessible));
 
+  if (accessible == NULL || entry_accessible == NULL)
+    return;
+
   if (entry_accessible->current_label != NULL)
     {
       atk_object_remove_relationship (accessible,